Skip to content

Recombining circles doesn't work #3234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Sep 19, 2025
Merged

Recombining circles doesn't work #3234

merged 3 commits into from
Sep 19, 2025

Conversation

JasonAtClockwork
Copy link
Contributor

@JasonAtClockwork JasonAtClockwork commented Sep 8, 2025 •
edited
Loading

Description of Changes

Fixes #3149

  • Fix for MoveAllPlayers calculation to force the circles apart
  • Fix for PlayerSplit to properly calculate Scheduled_At for the recombine timer

API and ABI breaking changes

None

Expected complexity level and risk

1 - Trivial

Testing

I've loaded this up against the Unreal Blackholio comparing the server-rust vs server-csharp.

  • Confirm split + recombine work correctly in the Unity client

Note: The demo/Blackholio/client-unity project is currently generated with the server-rust bindings

@JasonAtClockwork
Fixed NaN issue with server-csharp with gravity recombine
8518018 
Fixed logic for the schedule_at time for recombining scheduled reducer
@JasonAtClockwork JasonAtClockwork self-assigned this Sep 8, 2025
@JasonAtClockwork JasonAtClockwork marked this pull request as ready for review September 17, 2025 20:02
rekhoff
rekhoff approved these changes Sep 17, 2025
View reviewed changes
Copy link
Contributor

@rekhoff rekhoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that these changes bring the distance calculation changes bring the C# Blackholio server closer in-line with the rust Blackholio server (seen here:

SpacetimeDB/demo/Blackholio/server-rust/src/lib.rs

Line 347 in 123fc72

let vec = diff.normalized() * (radius_sum - distance_sqr.sqrt()) * gravity_multiplier * 0.05
)
The new time duration for recombining also makes logical sense.
Assuming testing is completed with no adverse effects, then I see no reason this shouldn't proceed forward. Marking as approved.

jdetter
jdetter approved these changes Sep 19, 2025
View reviewed changes
Copy link
Collaborator

@jdetter jdetter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix makes sense, haven't tested it myself though as Jason has already tested it 👍

@JasonAtClockwork JasonAtClockwork added this pull request to the merge queue Sep 19, 2025
Merged via the queue into master with commit d0d99b9 Sep 19, 2025
32 of 39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdetter jdetter jdetter approved these changes

@rekhoff rekhoff rekhoff approved these changes

Assignees

@JasonAtClockwork JasonAtClockwork

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Blackholio C# Module: Recombining circles doesn't work
3 participants
@JasonAtClockwork @jdetter @rekhoff